Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Dec 2011 10:20:29 +0000 (02:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Dec 2011 10:20:29 +0000 (02:20 -0800)
commitc151adf30ff2a12c61b8d8afdb25c1773060ad13
tree52d4ec3027c6bcc5c17de9d1ead4aca778fd4c44
parent06767143fa3c5b2a226ff77c50694c2d9c82d7a7
parentc03ba56caa74a3883a2ac1868862adefa9f162bc
Merge from trunk.